From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 23 Jan 2011 04:34:48 +0000 (-0800)
Subject: * src/image.c: Add cast to fix type clash
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5094
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=af4258c2d2eb11d9a335f92896d584a34021df59;p=emacs.git

* src/image.c: Add cast to fix type clash
---

af4258c2d2eb11d9a335f92896d584a34021df59
diff --cc src/ChangeLog
index 0c383f2e71f,7850d191c20..d1fcc4ebb1e
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,5 -1,8 +1,8 @@@
  2011-01-23  Paul Eggert  <eggert@cs.ucla.edu>
  
 -	* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type	clash
++	* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
+ 	when calling XpmCreatePixmapFromData.
+ 
  	Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
  	* lisp.h (SSDATA): New macro.
  	All uses of (char *) SDATA (x) replaced with SSDATA (x),